Update from the Friends of Ware branch