Changed for production test