Added mobile optimizations