[Bubbles] Finally refactoring