A redraw from 2016, an OC in APFE Project