More armor management