Mobile optimizations round 2