using non-snatched as source and add comments to changes