Removed the reliance on NadMod (I think)