additional defaults refactored