Added functionality to unit selection