MC: Working to restore original functionality