Adapted to run in COMPS