Updates according to supervisor notes