Updated ranges and tomaso