Add numberrange logic