Before revision: War is an armed conflict between armed forces organized under a certain command structure and having the capacity to sustain military operations .
After revision: War is an armed conflict between the armed forces of states, or between governmental forces and armed groups that are organized under a certain command structure and have, or between such organized groups the capacity to sustain military operations .