updates from @philwareham