some changes for deployment