Initial fix to upgrade for new sauer release

This code will not compile but it is a step in the right direction.
I hope...