AVALANCHE: Set the Magic surface as private, some associated rework