More conversion to handlebars