working on fixing JS