more work on modals