Update for optimization on mobile