added class 2, assgn 1 & 2