Patbarry/suggested edits

Jin will spike this