Got rid of those awful headers