Checked with fixes but must revert to a list of points after this.