Assigment 3 without comments fixed