Change goal model, and added points