Updated Class #4