Changes to make Susan happy