modification from branch NURD_v1.1.0