Second commit, all armors done