Pzhang/nokia.phone status

And move this code after the switch