Added a boolean to make the switch to and from 3.2
speedup easy.