TCRP changes for EOCTs