Tiad & Mib refactored.