More JS stuff from JS CS #2