Created better headers