More edits to class 8