more work on the js