Before move to dev server