merged chapter5-example2 changes