Updated with latest from js.js

IGNORE THIS - INTENDING TO GO THE OTHER WAY