updating to fix issues from updated NoPL code