this simplifies the code a lot. We're not going back to 1.0