updated default values to use functions.