some updates to the MDC handling