Incorporated review comments from Rene Hummen.