Refactor Capacity