Undid some old changes, should still work