Changes from hbs.js