fixed all broken wires in current change