Make life a little more interesting for the V1 prototype