adding avoid stuff and timeouts