Modify return of the update process
Fixed several functions
Fixed several functions
Unify calls to join and separate functions