refactored to fix handlebars helper conflict