adding optimizations for mobile