Some changes on app logic for new features