edits per gabe's comments