Some changes to make Jim's merge work for me