Bacon bits.
Fixed merge conflicts