updates to fix moc registration