Made changes as jsocol requested