p67, refactor p16