some changes to deploy, towards real deployment to production