Fixed jeff
Merge remote-tracking branch 'origin/battle' into battle