some more work on modals