Some modification at the connectors