Cleaned up tau labelling: