This is the version we ended with on Saturday