some changes in battle still working on compute