with the help of Mateo, I'm pushing the changes to the repo.
please check the commits for the details.