Add comment and use correct distance number