Changes suggested by client