Making less dependent on the one-page model