@bfitzpat, can you adjust the PR so that I can see the real changes ?