changes to support handlebar.js