Next

As proposed in #1010 - what do you think?