Folding bag fixed. Refactoring.