put headers in the right place..