updated to using new defaults system