Converted PenTool to DrawingTool