Selection of units now working