Removed the old datapoint approach