new version and small edits