More JS changes