assignment1 and assignment 4 added