Assignement 2 completed