Last changes for server