Added unfold method