Updated to handle left/right connections