changes suggested in client call