Partial Refactor