Rewriting to do away with needing to know about version