merge with old A/V setup