Re-organized connections