added points from Stian