Changing a lot of core systems