Revert "More tweaks..."

This reverts commit 2e6755f42528383e5bafbae75117f68e0861ce0c.
Tweaks