edits based on noah's comments