Refactored Sarge