#227, added modal dialogue