fix for mobile P4. improve for deploying