Assignment 1 updated
final version