tightened up JS even more