Changed format and included norms