infrastructure changes for upcoming stereo improvements