This new code seems like copy and paste from the code above it. Make one version of the method. Accept null for the final param if you must.