Altered variable assignment with default

Existing variable assignments were not being respected.  Variables modified with "!default" to retain existing values.