Commit class 8

Commit class 8 ...