// minor edits