Yeah, they tried to "improve" the retainer interface this expansion, but only made it more tedious.