FSET-227(by Rory)