Added optional stop bubble adjustment