Updates to make a single server