[DEV] update new archi (step3)