Js attempted fixes