Added tp and tphere. Not tested yet.