More work on next version

nt.