I tried and I did. Actually I started there. But the changes seemed to me too destructive. Otherwise, this method used once and who cares what happened inside?

I can make another pull to compare solutions or can revert files and change them here.