improved drawing and selection