add the rest of the NU hack