Update to optimize for mobile