changed to new notation