Revert "Revert "Implemented Tony's modification"

This reverts commit 30a8cff149376b5c66833c001be5002255f48b09.
Revert "Revert "Made a quick change to fix the paths.""

This reverts commit 4ce5578dae0a562389e18ccd9161b343cf066b2d.