More plot elements, more of the goal graph