Added first half of class 2