couple improvements to first example