Changes to work with the new 3.2 format