Working on update-system