Modified driver file for proper cli