Switched pins to new layout