Added variables, add git squash