Add delay and distance checks options (disable by default)