Minor changes to bomb
Auto-merging