changed some notations