Feature/1.1.6.1/battle