modals resctructuring