Made the bundle clearer to set up.