Removed connectivity check