Final commit for bubbles and hero conditions (untested though)