Higher order integration, addition of dmat class, changing of notation