Updated class again