edits from Mike