Updates after debugging