Changed the ways the variables were assigned

This might also fix it.