Revert "Weird looking weird looking fix fix"

This reverts commit 0ec5ff2b1189561b169dbc698ba106e4ba6e4596.
Revert "Weird looking fix"

This reverts commit 0a024c4d188640b91389650449b49c237bba5719.
revert & rewrite