rework server saving