Changes following Diego's review