More inteligent unfold feature