code changes for issues raised by off-shore...