device selection improved