Addi/.bundleng changes