Refactored Ergos