Changes based on live testing