Version 2, picking up on an idea of Adriaan.