Retooled with increased functionality in mind