Now we just need gun kata. We have grenade kata. To be fair, the training should include that. That does seem like a vital skill that at least needs some encouragement to appear in some people. I heard a good thing about situational awareness on a paul harrel video where he basically said, if you consciously make yourself do it enough, you will do it without thinking about it eventually.