Revert "Trying Something better"

This reverts commit 2f4264675826e08db4214e401a499fe1e12985b4.