new version and small fix