minor edits by charles