changed to support cfse and sam