updated

and finished assignment