Some changes made while debugging the next notice