Updated to get rid of notations