Trying to change the logic.