optimizations
data collection updates