edits up to 3.1