I am going through your change and adding them to the push I will do. This variable i is defined at line 67/68 above