Applied changes from Discussion with Maria and Manon.