Implement suggested changes