Implement changes from feedback