Class 16 final commit.