merged mobile to master code