REFACTOR, added array with points