yeah, we spent some time trying to "fix" things and both came to the same conclusion that this approach is much better