// some minor edits