t: use nongit() function where applicable