upgraded shifting to sort, match js tool