Added back battle stuff