update to defaults. Added range support