Maite's optimizations for mobile