Added non-thread safe methods.
Updated client2 code do to new callback functions