small unfolding changes