Continuing work on the modal