making some changes so compatible on dev server