committing most of daniel edits