near-final stuff for 0.7