triangles and goals added