Preliminary commit
Some changes of variable names