new version works A OK