JAWS improvements