Re-designed the connection matrix