Added comments to show where I changed in each file. For ticket #146.