updated classes and js