js3 changed to js2, moved some things