Lots of major changes to Schwaller and minor changes to Bertsch.