APINEW-18 fixes & new func