Timeout, minimum distance and fine-ceiling added