Lots of changes, next to final revision