refactoring to aether, etc.