Added group draw and group update