Add between operator
I'm sure I had a good reason for these changes