converted legacy handlers to modern (nw)