Edited for CrystalCM11