Update 2.0 Final update for Ass4