Added drawing shapes, av7