new version and small code change