Updated SimElectricity