new version with new bug fixing