Rework upper pinouts