pinout changes, mostly --KW