Make more general use of modal