moved things around to work with handlebars