Change client code for testing