Need to change the NG-specific stuff