Put Katusha and BattleCardView into master