Updated with latest from js.js