Added transitions (and some comments)