App logic changes