modified for db cr changes