changed est access moment calculation
reordered functions
added new data points