True that, I had a load of code in 2.7 which I was dreading migrating to 3, but pretty much that change sorted it.