Animated bombarmang
Fixed merge conflicts