Added func to parse to points list (+ changed names)