Changed Headers and Added Folding