Revert "Revert "Revert "Revert "More Improvements""""

This reverts commit 8efd11adef032b75cb840d80f55b544ba4a1a993.