fixed new issue 53
more udpates
more udpates