need to revisit the logic here after the workshop. This change make Don's bundle works