adapted to updated moc handling