Added mobile optimization