Update from NovaFusion Source