more changes to make client work with new server