you may want to change the example here (and maybe in other places), too, since you removed NGP above.