Updates after testing