Updated Class