changes to run via StartClient