Can now update goal states alongside goals