updated and improved Bubbly