Added eta_eff
Correct number of outputs