adjustments for mobile, minor security added