Logic changed