added class 4 and 5, fixed 3