changes missed from @matt-e-king