matching changes to hugh's to make merge successful