Added changes according to NEARP-930