Changed code for testing w/out the server