Updated Crystals WIP