final changes for Aug 5th assignment