latest changes based on client comments