Updated to current HNHUi