Working commit for bundling.