updates for TRC support until merged