Further work on armor generator