Updated bundle code