Perfomance improve - test=production