Fixed issue with return. New defaults.