merge in updates from Sam