Commiting Marcus' changes in render.js.