JS updates
Main JS