Tweaked distance set up