New condition logic updates.