pre 0.11 upgrade