Updated data analysis module, more user friendly