integrated the new notation more