Main JS Updated