Mostly, this involves adding the big block at the bottom and making 9.6 a variable so that it's easier to compare different versions of these.