Server improved