Revert "Debugging Part 2- All changes listed"

This reverts commit 77f88a85c13ce50143a6548c0d4abbb197b0a923.
Revert "Revert "Debugging Part 2- All changes listed""

This reverts commit 6e4fefaa96efe06a6a371eb3cf282d0425a8551d.