Added code folding stuff