Switching hardcoded values to use variables from the defaults file.
Switching hardcoded values to use variables from the defaults file.