Added aand2.

I'm starting to think a better solution would be for the '2' versions
to be the default and the '1' versions to be the ones that need to be
specified.