Lots of changes to update with last server