edits based on Lisa's comments