Mobile changes
Please resolve conflicts