this behaves differently in upgrade, commenting out till i can look at
it more