modals improved