SOE-278(by Rory)

A