forgot to commit refactor of datapoint