Update: Diop2017

Notes