Updated to include bundle