Final Update Class #1