working on changes for deployment