Refactored post partial out