Edits to class 8