I am already glad to not be threading through that param, that was always a leak