refactored driver scripts