RectTool improved