Updated main js