Lot of changes to the app