finished firt part of PLFM-1708