Changed the API to deliver only one bubble at a time and then mark it