Made -t command faster