refactoring because of timeout handling
bootstrap 2 to 3 migration
fixed node_driver issue