you can presumably just move these to the function now, not that it matters much