new version fixed bugs