Removed lan requirement, explicit network timeouts and added a safety element check