major changes for modals