Go back to safe individual connections
Fixing up specs