I'll do that in a separate pull request