Updated again for Demeteorizer