Server 4, 5 and 6 are being merged too