master
Adjusts to match API changes for AbstractMorphWithUI for more flexibility