refactoring, moved to latest versions