new version and small changes