Added second option with luminosity in NFAA