Fixed bug in points calculation, fixed the model