Updated with latest bundles