All MCI functions are now cleanly separated.