improve w/ headers preview