Updated model, no fix yet for pipes !connecting.