changes for mobile clients