Updated for the new structure of sbtrc