Finalizing energy storage tanks for Opti-flor