I started on a merged branch, and fixed the where FleX and WaveWorks didn’t play nicely with the GPU resources. I’ll continue to work on the merged branch after the new VXGI comes out week. The FleX water shader should be out the door next week, I believe.