mrc's first pass revisions (on the correct branch)