reorganized first modal