* Changed code to stick to the original client program