Reorganize after meeting and new figures