Completed revised version of assignment 7 (Shareist)