Refactored that...rolled them into a single method with single param.