edits based on rsoden's comments