Unfolding updates + experimental stuff