Re-arranged headers