Added folding options
Merged changes