merge in charles' edits