We should start with Elephant Archer rework. Since that unit already needs addressing.
My suggestion here-
Further explained-