Further optimization for mobile.
More mobile changes.