Modification Jul 26 - 3

Fix Bugs