Finished 118c using 117c final plus a couple edits