assignment1 and 2 added