New version and some more experimentation.