added new version of unfolding