Tim's RANG updates