GW Refactored