Ok. 
BTW, looks like GetDeviceName() is not used anymore afther this. Should I remove it?