Updates after live testing