improved unit-selection