Final version of assignment
Final version