merge in updates from Thomas and Brian