Not sure if these changes are legit or what. Not tested.
All tests pass