Yes, and that same diagram was in my P-80 manual back in 2001 .... From a safety stand point, locating it before the pump has proven to be prudent deviation.