added optimization for mobile networks