Merge this with the above conditional