- more pDraw refactoring