added -E and -Z options, and allow for the 2 servers to have different