Let me know if I should keep these changes.