New headers and better design