Extensions: ~ some refactoring suggested by Pat