#17: Refactor partial