Updated for dose 3.2 release candidate 2