Refactored the overload solution

not sure how this will ever be hit