Added lines to fix unfolding; dictionary updates