Bunch of changes from the boss lady