Add mute/unmute changes to features branch
Fix Managers, Re-add deleted code
Fix managers, re-add deleted code for