Battle now working