update to use UGCS table