Updated Class and js