Update to handle mutes correctly