I had a function for this in my first commit, but a dev suggested to remove it in order to limit the code changes.
So, do I need to add it back?