Bubbles rework by RYVAGE