Refactored to use default settings