Revert "changes"

This reverts commit 499dcf2d17981977fe3e2f1e82bc4c282e66f3d1.
Various Tweaks