MINOR CHNAGE: Connectors adjustments.