more work on battle transition