Final commit of the rangefinder