Shorter again changed header order