all done except for removing rects on update