new version after discussion