Updating code to reflect latest nh beta