added more bubble, needs code review