just submitted this pr, no need to merge if doesn't makes sense
Thank you so much @thecodacus! I will take a look at this tonight!