Added Bubble Fixes