edits from dan