Updated to use more reasonable default values.