new versions from Rudolf