Changes based on real world testing