updated and js fixed