Debugged and optimized datapoint system.