Final work on assignment #36