I'd suggest parameterising this too, just to be on the safe side.