updates from Matt
merge