tonights edits based on kate's feedback