Flow logic changes