some backports to electric ...