Second updates from mbarnes