refactoring for new infrastucture, license change