some changes made for production