Some change to points definition