second commit with updates from vacation time july 2013