sounds good. I will create a separate pull request