SDMS-812(by Rory)