Updates for mobile and changes/revisions round 1