refactored one partial