Enhanced to call xDraw().