A lot of major changes to both