Made some changes for production