SDMS-925(by Rory)