added changes for production