unfortunate design changes as per spd/rc