small core optimization, battle window is under work now.