revised modals completely