Last I heard, Hyperflow pretty much shut up shop on a lot of products.
I couldnt get any of their catchs cans, had to go second hand..

Im thinking the baffle may also be an idea that someone else mentioned above..