JS working changes