added the circle and rectangle forms