Version using for coffeehouse
Updated the ML code to use the bundle code, should speed things up...