Updated for dgroc