Changes to UI as well has touch up of all views
Same