Changed fold structure slightly