changed to match the expandable interface