Improve folding
Better ,m; mapping