Squad added; circle color generalized