Altered to fit my connection model