Inshallah final changes to Assignment #7