Added battlefield to handle #2