update for new A/V changes