More work on Rangefinder