New version of planning, after discussion with Francois