added points, simplified code