new version

new version after first comments