new version with review fixes