Revised proposal to AF 14.05.2018