Updated rangemaker