Modified Bubble class