When they went into the shop and asked to look at the engagement rings, the shop assistant brought out a cheap one, ________ she has arranged with James.
A. which was that B. what was that
C. which was what D. that was that