updated f-wave-solver