Made some changes for deploying