Folded some code