Major updates to CompassDEMO