GE-3: changes to distance controll