expanded units and targets to include attack/defense