Complete Assignment with very minor changes