not sure what was changed, but it all works so I'm commiting