Some edits through 4.0 and 4.1