Finished adding Prof. Adams' edits