Update to June28 supplied code