Moved some JS