added inf_na_zero & hijack