Re-added FLORA and XU