SFM: Bundler continued