major commit in NCAP module...