Ok, I _think_ I follow all of this and have made the changes. We shall see when you review my next push.