Changes from sf-te