new version
before merging in 4.6.1