Changed header back to old way. Seems to work better