Updated with new javascript window/speed improvements