bugfix+change of points