Changes to match old code