More revisions and simplification