build thesis with edits for c5-7