Minor changes better suited for presentation demo