Should play nice with Stof Bundle now