Edits based on Mom's comments