continuing transition to handlebars