Some notation changes