comments, increased modularity, UI streams for all methods