adds edits from jeremy