Tuned up UML to take Josh's feedback into account