Thanks for clear explanation!

I did everything as was described and pushed these changes.