restructured for handlebars