Change setDefaults() to use new functions