Changes made by Dhaminda Siriwardena (dhamindas@dinotait.com).