changed position of variables
Merge branch 'battle'