greatly improved drawing