Updated to allow ranges (not used)