Still more work, still some revision.