Bubbles added
Merged conflicts