upated for multiple modals