Updated Class File