Re-arch server ongoing