Fork to Upstream

Hi,

I have added some comments please check