Final edits for first class