3.1.3

Changing around some variables