Pre-HCI changes