new version with minor bug fix