changes in client and scheduler