Update #32.2

Lots of changes