More condition logic updates.