Second half of class edits