Some commenting and brought the fold version back