Finalised new bubbles hopefully. Need to iOS test