finish work on Range for #493