Smartphone optimizations - issue #15