Re-order fluid initialization