switch to using Points class