Added the logic from previous project and fixing the bundle passed value.