add headers, add rwd support