Improvements to tip and bubble