David - Additional changes to match what we do normally