Adjusted for production server