refactoring for first deploy release