First completed pass at interface-failure consistency