Assigment 3 and 4 updated