Updated class 1