minor edits from jason incorporated