added FNR support