Update in Controller

(still lot of changes to do...)