Change output header
merge with zhchen