More logic changes