Reworked the Connection
Reworked connection