Partial revert of some of the changes I made earlier