Edits for 2.1.0