major refactoring on data points and bolt