Changes from Hebe35