applying some of the clients feedback