minor edits based on Vad's feedback