more wiring

Change-Id: I7d37add05ce623f40968e57734f538b91781b6b3