Moved goal state to header