Final logic changes